From 7169017f841ddc48438c25b58973405cfa328b44 Mon Sep 17 00:00:00 2001
From: Ewan Mellor <ewan@xensource.com>
Date: Sat, 2 Dec 2006 16:39:53 +0000
Subject: [PATCH] Make the xenfb tools an optional part of the build, as they
 introduce new dependencies (libvncserver and libsdl devel packages).  Enable
 them with XENFB_TOOLS=y.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
---
 Config.mk                      | 2 +-
 tools/Makefile                 | 2 +-
 tools/check/Makefile           | 6 ++++--
 tools/check/check_libvncserver | 6 ++++++
 tools/check/check_sdl          | 6 ++++++
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Config.mk b/Config.mk
index 364c7231c4..08873d69d4 100644
--- a/Config.mk
+++ b/Config.mk
@@ -69,8 +69,8 @@ ACM_DEFAULT_SECURITY_POLICY ?= ACM_NULL_POLICY
 
 # Optional components
 XENSTAT_XENTOP ?= y
-
 VTPM_TOOLS ?= n
 LIBXENAPI_BINDINGS ?= n
+XENFB_TOOLS ?= n
 
 -include $(XEN_ROOT)/.config
diff --git a/tools/Makefile b/tools/Makefile
index 29ce67dfe2..b4156fc904 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -19,7 +19,7 @@ SUBDIRS-y += xenstat
 SUBDIRS-y += libaio
 SUBDIRS-y += blktap
 SUBDIRS-y += libfsimage
-SUBDIRS-y += xenfb
+SUBDIRS-$(XENFB_TOOLS) += xenfb
 SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
 
 # These don't cross-compile
diff --git a/tools/check/Makefile b/tools/check/Makefile
index 4605c03c39..0b87aea259 100644
--- a/tools/check/Makefile
+++ b/tools/check/Makefile
@@ -1,3 +1,5 @@
+XEN_ROOT = ../..
+include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all
 all: build
@@ -5,7 +7,7 @@ all: build
 # Check this machine is OK for building on.
 .PHONY: build
 build:
-	./chk build
+	XENFB_TOOLS=$(XENFB_TOOLS) ./chk build
 
 # Check this machine is OK for installing on.
 # DO NOT use this check from 'make install' in the parent
@@ -13,7 +15,7 @@ build:
 # copy rather than actually installing.
 .PHONY: install
 install:
-	./chk install
+	XENFB_TOOLS=$(XENFB_TOOLS) ./chk install
 
 .PHONY: clean
 clean:
diff --git a/tools/check/check_libvncserver b/tools/check/check_libvncserver
index dc9ed9153d..69efd063b3 100755
--- a/tools/check/check_libvncserver
+++ b/tools/check/check_libvncserver
@@ -1,6 +1,12 @@
 #!/bin/sh
 # CHECK-BUILD CHECK-INSTALL
 
+if [ ! "$XENFB_TOOLS" = "y" ]
+then
+    echo -n "unused, "
+    exit 0
+fi
+
 RC=0
 
 LIBVNCSERVER_CONFIG="$(which libvncserver-config)"
diff --git a/tools/check/check_sdl b/tools/check/check_sdl
index 7832910355..aac0130fe3 100755
--- a/tools/check/check_sdl
+++ b/tools/check/check_sdl
@@ -1,6 +1,12 @@
 #!/bin/sh
 # CHECK-BUILD CHECK-INSTALL
 
+if [ ! "$XENFB_TOOLS" = "y" ]
+then
+    echo -n "unused, "
+    exit 0
+fi
+
 RC=0
 
 SDL_CONFIG="$(which sdl-config)"
-- 
2.30.2